add some strange tests and fixes