moved tests into functional areas