Made documentation more consistent
Added more tests