Cleanup testing + other minor cleanup