Restructure tests. #1
roxygen update