Updated some testing