Cleaned up unused variable in Extensions, extended Tests.