Improved tests a tad bit