Fixed tests!

Tests should work now