misc stuff - next, adding unit tests