* Added some test cases to test.mp, appears to be mostly working