Add test command, code clean up

- Removes an unused reference
- Switches an int to a bool, because of its usage
1.5.1