Cleaned up some unit tests