Some small changes to method access
Added several more tests