Update tests to pass w/ minimal tests for now