updated test details and improved tests