WIP: data-tests

remove atoms and use hard coded ids.