Fixed some more unit tests. Have some device manager issues maybe. Many of the remaining unit tests to fix seem to tie back to the device manager.