WIP continued funky test behavior, but technically working