Added mocktests etc