Test code clean up

- Changed expected  html building from tag builders to one line strings.
- Changed vars to appropriate types.
- Shortened test object namespaces.
- Added some of the missing tests.