Test case additions, just commented out some crap