Adding full test suite