- Added test architecture
 - Merged mem functions