Updated tests and removed unneeded class