Unit tests and move to correct package