modified tests
merged app_test