Fixed some naming conventions, added unit test