Changed name of methods

Put the wrong functionality to the wrong method
Test going over edge coded. Model not working

Remove System.out.print