Added more test cases, fixed problems with Base module