improved tests slightly