init test, refactor components