Fixed some tests that were breaking. Now everything passes! :)