Remove clutter + add some tests

Change-Id: Ib0e338691b18de4d8b3099a55665886037590d24