merged, compiling but tests failing