Fixed unit tests to match the old one
Removed old unit test