Work on tests
Rename method to avoid unwanted behavior
Merge from wampv1