Added more tests, script was adapted