TEST: fixed, added tests