Cleaned up unit tests