Improved tests to always use doubles