Made a few things more testable. Updated README with screenshot