Fix Tests and Build