Added upcoming features (commented out)
Updated test file