TST: fixing test cases along with new changes
BUG: forgot to include makefiles