All Happy Path tests passing