Organize and added tests