Revised unit tests