cleaned up the test sooooo much, but haven't tried it yet