Updates for testing, added overrides which contains some trick code, updated lab