Latest changes to get tests working

NOT COMPILING