updated tests & added six compat module