Release 3.0 Progress

Cleaned up unit tests