5/5 and added tests