Work in progress, for writing unit tests, minor update