begin fixing up tests