Added mocktests to test files