Renaming test. Removing short circuiting until I can figure what I should do with this.