Constructor tests and whitespace bugfixes