Added more tests for pre-app