Let exceptions bubble
Update test
Mark test as WIP