refactored tests to accommodate latest modules