Fix ordering; comment out apphook tests