Feature/test

Noticed lots of lint errors popping up in here. This should address that.