Added more tests and expanded testframework a bit