More tests + fixes for rank constraints
De-gruntify build