Fix app setup to be standard
Fix bug in test setup