Codestyle fixes and a base test case. Doesn't pass yet. WiP.