More testing added.
Having some issues with a couple of the tests and css, will need to revisit.