added more tests and modules