M5/master more tests

Review of tests