Fix another instance of previous bug + updates tests