fixed additional tests