Too many instantiations to test features. Removed some redundant ones.