Corrected breaking tests. Build is now successful