Splitted into basic tests and advanced tests.

Added more tests.