Unit tests pass again!
Better test handling...
Unit tests passing, need expansion.
Fixed feature tests.