Added more tests, fixed credits