Add test helper, gems and cleanup 001