Cleaned up some tests