Added some tests
Removed dependency on Conductor. Lots of cleanup and tests
Added test coverage for attribute types