Clean up Concepts

Each bullet has been taken care of. Only needed one new test.