Quick commit before I merge the new tests