tons of changes working on test