Corrected tests and everything is running =D