More happy path tests
Minor error cases