NEW: test coverage now shoud be over 40%