Refined a few methods and tests