Updating to get some tests working