if possible, put the legacy stuff in separate test