Testing

Don't merge yet. I will need to update the tests once the latest branch is merged in.