Tests cleaned and controls added.

Tests conformed to Python convention and input controls added.