Updated and added tests