Testing Code Revamp

Sorry for the mass commit