Added create method and extra tests