Added ipad/iphone device idiom macros. Universalised test view controller.