Fix tests for new app dir structure