Adding two constructor tests and fixing a couple of bugs.