just finishing everything out
updating these tests to be a little more accurate