Cleaning up and adding some tests