Added additional toolbar tests. Toolbar tests are now pretty much complete