Added more tests, updated testing lib to 2.0.3