Code coverage 80%

Added testing to bring coverage to 80%