Fixed prev changes
Fixing Test page
Had problem merging branch

Deleted branc and copied and pasted... lost history, but oh well
merged latest
Fixing  bad merge