All tests green, refactoring with fixtures complete. Readme updated.