Some changes made. Test private methods, work in progress