Improved documentation & simplified tests