Fixed #11, implemented testing for queue as well