Fixed tests

Please merge and push to master as well :)