Added better unit tests for attribute, added query unit tests, stubbed tests for remaining components