Initialize system properties the right way! :D

Removes hacks and fixes tests. Awww yea.