some cleanup & committing fixed tests