added /instance tests, made fixes