added tests, corrected tests