renamed setter parameters
Moved tests to com.stephen package