Small update and added tests