Tests for water and matrix
Fixes to adjacent neighbors grouping
Updated gitignore