added tests
updated progress