Finished off some tests