clean up of help message condition and added more tests