Implement testing
#NJSE-4 Fixed