Trying to get tests up and running once more