(BROKEN) Working on fixing the unit tests