cleanup naming and small refactor
adding binding tests