Added validation
Fixed tests, moved captainjs -> bin