#320 re-aligned tests