fixed the last tests..