bring tests over and get them working