Reduced number of tests. Removed unneeded test values.