Test fixes, added pwd encryption