improved tests and fixed bind and dependency issues