Updates to tests and Brian's additions