Fixed tests (do not depend on old data in DB), source format on app-context