Fixed tests to expect what the new bug fixes changed.  Added tests for maximum threshold.