Cleaned up tests to get ride of warnings/stylechecks/etc