Moved tests inside app