Move tests into test/ subdir
Add new tests