incorporated unit tests