Removed unnecessary code. Additional unit tests.