Finally tests fixed