Jeppe finish alignment layers

I converted the unit tests to use our helper layers. @petya2164 please take a look.