Adding some tests and messing with names.