Fixing + removing old test code