Use shared stubs, and fixup some issues according to Joel comments
Delete other dummy files, and use shared stubs instead