Added more tests + spec output