remove public method
fix php method
rewrite rest unit tests