Use redirects
remove extra asserts
hack to get tests passing on python 3.2
More docs