SameIntent, added some tests, organizational changes