Bundle discriminator strict

Closes #167 

Some tests had to be rewritten as the bundling behavior has changed.