Closes #94: made it into a property, plus fixed some tests in the process