merging w/ dev and fixing tests