Fixed tests (???)