Fix missing tests and coding style

Fix #54

paired with @dmose