#2 - Started adding tests