Added more test-cases

Unfortunately I'm not very good with mocking so many of them fail.