Merge "add fsTick() to RepositoryTestCase"