Branch now builds successfully
More work on getting unit tests passing for DEV resources