Fix non passing tests