Cleaned up failing tests

Summary:
Cleaned up failing tests and cleaned up some of the way we handle
parameters when we instantiate a new object

Test Plan:
Run tests
poke around in repl