annotate tests, although failsafe-plugin didn't seem to be working
refactor build into modules