Updated tests and module