Added more tests, corrected aesthetical stuff