Happy path scalatests now all work. Cleaned up code comments