Cleaned up a bit and actually added another test due to curiousity..