Added remaining tests to get 100% coverage