Moved the unit tests to the right place.