Test added, #4
#4 added progress, added tests