Added more tests, modularize code more, added constants, adjusted controller.  This commit is work from 3/28 which I forgot to commit