Merged tests. Will now pack and submit.