more unit testing work (WIP)