Initial commit with water tests