Added tests. Need to get them to run with the rest.