Swtich to minitest and add more test cases