Re-implemented tests