Implement white list attributes and fix unit test

This implements the white list attributes in collins when reprovisioning in addition to fixing all failing unit tests.

Note the unit test for the project as a whole fail due to lack of clean up at the end of the unit test, however every test passes individually.
Indentation is off here.