Fixed build/Unit Tests

Now to add a buttload of unit tests