More Tests

Src folder at 43.7%