Z&S limiter not working properly, rolling back to see if this addresses this
Updated some tests, modified makefile