Updated documentation, added additional test