Start applying test implementation