Added additional tests and refactoring rectifier to try to improve
performance and get away from constant string evals