Updated test methods.
Updated code formatting.