fixed & extended tests
merged