more tests
removing hack -sorry
merged with lastest