Deleted unnecessary class
Added errorhandling, tests