Correct annotations. Move tests to poltergeist