Separated test from app