test: fixed and improved tests