Moved tests into own directory, need to expand tests later