Fixed tests (still need to make respectable ones though)