Few more bits of test and javadoc
Update Availability