Added more specific module title, modified tests accordingly