Added english and jap home test

Refactored the code a little