Broken - Fixes for unit testing