Remove unused class
Added some tests