Added interface tests, restructure test files for test-spec