added another 2 tests and fixed several modules