more tests and fix for clashing