work in progress: fixing unit test