more tests -> sections refactor