* Added complex tests, and made fixes