Made functions to control override abilities
Made tests test override, which previously broke tests