Added new manual and changed tests