Fixed tests that wasn't working