XD-282 Cleaning up and extending tests