updated test
Merge branch 'develop' of github.com:BrightfishSoftware/HaploMvc into develop