updating & improving tests