added more tests for */** and fixed stuff