Cleaned up a bit and added another test