Added test and some new architecture stuff