Added more tests, de-tabified