Enabled old tests, first attempt at a simple unit test.
Added first draft of new test.
Fixed test import.