Restructurize tests