Mainly adds some testing.