added enhanced tests