Change tests package, Add 2 more tests