(+) Added more tests