Revert "Added some tests and tweaked some things"

This reverts commit 47e0142e1e918d0dbd53b183049adc3766fd89a0.