Added some tests. Need to check out fire functionality