saving work - more unit testing