Fixed an import error
Filled in a few more tests / stubbed more tests