restructuring FitNesse tests
Merge branch 'entry' into entry_form
fitnesse tests on entry form