Added new tests and example