Disabling tests
Updated docblocks
Disabled some tests