Cleaned up tests and test injection behavior