Improved tests again