Various fixes, add spec for init class