update of test command
Brought test coverage to 100%

Small bug fixes along the way.