Cleanup
Cleanup
Bugfix, name parameters
Added more tests