atomic tests for webapp api
Merge remote-tracking branch 'elijah/bugfix/atomictests' into develop