Remove old test, add new one that is closer to what user code should look like now