Removed unnecessary things
Added more unit tests