Improved tests. #159