Cleaned build and tests. Now to add new unit tests!