test and constructor fixes