Project adjusted to unit test format