added unit test + deleted unused class