Fully comment out commented-out test

Change-Id: I23b42998c72f190addb75a4b9e624f0c3c948f8f
Remove dead code

Change-Id: I46ca823d4bfd6ccdb47ce4b4bb793ec81bcc35d9
Remove dead code

Change-Id: I6034174b2273def43d176c3f463c1161757c8f70
Clean up function declarations and enable some forgotten(?) tests

Change-Id: I0e0d05a5b226b5c59798345f402f8a7724d2689a