Revert "More tests"

This reverts commit 467080e7979712760be7d266289c4a42b6113e51.
Revert "Re-add removed methods"

This reverts commit 1a7f3972af88446163522cedccac41fb160cbd33.
Revert "Fix tests"

This reverts commit 6a1ab428c311780fa7f40f8f060b05023fe61ece.
Revert "Bug fix"

This reverts commit 7e76cf21689669715655fe0d1f7480250fa94395.
Revert "More tests"

This reverts commit 55219bd799388fa8fa29e9317ecb410eacbce620.
Revert "Testing"

This reverts commit 9731372682124586a8a5605046ebe0d01ffc302f.
Revert "Added tests"

This reverts commit d426b9d635ad3e8e72e1f699078cdd2ceb652c2a.
Revert "Cleanup"

This reverts commit a6fa369e2c09ddb86b5d3d54f048f325bfd6e34d.
Revert "Tweaks"

This reverts commit 80fee16821bc35150e3443aef31346822459182f.
Revert "Dependency injection refactor"

This reverts commit 85fa5c13b4a4fffdd13a3b11095c484a91e6c150.
Refactoring
Added more tests