Cleaned up more tests and added two.