Added more tests. Fixed naming a lot.