Clean up bag tests

Move pig code into java files.