Fix #150, #138, #132, #154
updates to tests for previous fixes