Significant changes to give polytrix a feel similar to test-kitchen