Live tests, fixes #3