Moved tests to reflect package changes