Merges dev, adding tests to dev.