Fixing some test classes