Little fixes
More testing fixes