Removed some more rudundant testing stuff