Cleaning up, trying to get test working