change way test fns are stored; fix unit test