Added two more tests and removed "TestFor" which causes issues for test integration.