better and more tests and small fixes for introduced changes