Added: Test for reused aliases
Added: More UUID support and Java 7 syntax