Fixes for diamond and diagonal tests
More fixes after addingworking diagonal test