Fixed tests. Should pass.