Fixed user class in model + small changes to test + removed unused classes