Locking down functionality and upping the test coverage