Another test now at 96.7 % code coverage and fixed location bug