add wizard support
add missing tests