Tests: update structure for better readability and upcoming additions