Test fixes and small functionality update