Cleaned up solve unit tests