Simplify setup and testing