Added tests for pjruiz15