Lots 'o changes
Lots 'o changes
Lots 'o changes
Updates tests to fix build