Consistency changes and tests

Also removed non-Debian support