fixed test case and samples