Updated tests and utilize Create<T>