Renamed methods and changed parameters
Added som tests
New test methods