Removed warnings
Cleanup up test