Reduced scope of tests so that can be run in deck.