added test, removed unused classes
removed unused parameter