Test cases with updates to main class