[SQUASH ME] moar fixes
[SQUASH ME] finish up tests as good as possible