updated m3-test and added tests