Added more tests, added Timeline