Fixed failing Unit Tests.
Fixed all tests and modified existing ones.
MINOR: Added @package and @author phpdoc.