Adding test back into code