Thesis - Test chapter improved