wrap testcases around context to easily comprehend and some cleanup