Making some test changes to make it leaner