more test stuff and all [rebased]