PR 18 revamp... tests failing