Remove old Tests and Fix Broken Tests