added format option
deleted tests for stuff thats not in it any more