Revised unit tests for easier debugging