unit tests and module modifications