Cleaning up and adding pool tests