Cleaned up tests alittle
More test cleanup