added more tests, fixed failing longrun tests