Test is working again for the most part. Needs some more testing, but looking good.