Finish added tests